From: Miles Bader <miles@gnu.org>
Date: Tue, 3 Feb 2004 21:46:35 +0000 (+0000)
Subject: Resolve CVS conflicts
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~24279
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=0e2b6b009c12055e58441bf5a455915930ae55b3;p=emacs.git

Resolve CVS conflicts
---

diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index e23788785ba..18fcb62d6bf 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -600,4 +600,5 @@ FORMAT is 32 (not used).  MESSAGE is the data part of an XClientMessageEvent."
 
 (provide 'x-dnd)
 
+;;; arch-tag: b621fb7e-50da-4323-850b-5fc71ae64621
 ;;; x-dnd.el ends here